🧲 Update vscalc() function and add to documentation
#3520
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3520 +/- ##
==========================================
+ Coverage 31.48% 31.54% +0.05%
==========================================
Files 82 82
Lines 19562 19567 +5
==========================================
+ Hits 6160 6173 +13
+ Misses 13402 13394 -8 ☔ View full report in Codecov by Sentry. |
chris-ashe
force-pushed
the
update_vscalc_function_and_add_to_docs
branch
from
aa1f2c8 to
12d8b00
Compare
chris-ashe
force-pushed
the
update_vscalc_function_and_add_to_docs
branch
5 times, most recently
from
0deb114 to
fe4d28e
Compare
j-a-foster
requested changes
Feb 11, 2025
documentation/proc-pages/physics-models/plasma_current/inductive_plasma_current.md
Outdated
Show resolved
Hide resolved
chris-ashe
requested review from
j-a-foster and
jonmaddock
and removed request for
timothy-nunn
timothy-nunn
requested review from
timothy-nunn
and removed request for
jonmaddock
timothy-nunn
requested changes
Feb 17, 2025
There was a problem hiding this comment.
Where have all of the bscf and diamagnetic fraction output gone?
One of the integration test input files still has gamma in https://github.com/ukaea/PROCESS/actions/runs/13261719680/job/37019713666?pr=3520#step:7:287
Please rebase so new tests are available and Stellarator (old) is not failing
chris-ashe
force-pushed
the
update_vscalc_function_and_add_to_docs
branch
2 times, most recently
from
f7fd6ba to
9bc6d97
Compare
… and return values
… update related documentation and tests
…ion and update related tests
…elated documentation
… update related tests and documentation
…e related data files and documentation
…te related data files and documentation
…iable names more verbose
…d code references
…elated calculations and documentation
…elated calculations and documentation
…elated calculations and documentation
…culations and documentation
…te related calculations and documentation
…e related calculations and tests
…r plasma ohmic heating
… variables and update related references
…ariables and update related references
…and update related references
chris-ashe
force-pushed
the
update_vscalc_function_and_add_to_docs
branch
from
9bc6d97 to
f10d3d5
Compare
timothy-nunn
requested changes
Feb 17, 2025
There was a problem hiding this comment.
Need to update the spherical tokamak once through with obsolete variables
https://github.com/ukaea/PROCESS/actions/runs/13372261563/job/37343429082?pr=3520#step:7:1733
…m' for consistency
j-a-foster
approved these changes
Feb 17, 2025
timothy-nunn
approved these changes
Feb 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The
vscalc()function has now been improved and added to the documentation.web_orvs_can be used depending what better suites the contexth_toind_constants.f90plasma_ohmic_heating(), this also includes a boundary fix for the neo-classical enhancement for the resistivity that is only true forOld output:
New output:
The bootstrap current block has been moved below the volt-second section
Namespace changes
Functions
vscalc()->calculate_volt_second_requirements()Variables
gamma->ejima_coeff: Very generic name that provided no insightphiint->vs_plasma_internal: This has now been added to output.vsbrn->vs_plasma_burn_requiredvsstt->vs_plasma_total_requiredlpulse->i_pulsed_plant: Changed prefix to newi_stylevsres->vs_plasma_res_ramp: Didnt specify the flux in what system and when the consumption occuredvsind->vs_plasma_ind_ramp: Didnt specify the flux in what system and when the consumption occuredvburn->v_plasma_loop_burn: Didnt specify system or where the voltage was measured.rlp->ind_plasma: Very generic name that provided no insightrli->ind_plasma_internal_norm: Very generic name that provided no insightrpfac->f_plasma_res_neo✨ New additions
v_plasma_loop_burn: Wascalculated directly in the output section. Is now a tracked variable inphysics_variables.f90. Value is returned incalculate_volt_second_requirements()and has been added totest_calculate_volt_second_requirements()🐛 Bugs
Checklist
I confirm that I have completed the following checks: